projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5ccb74 6c30313)
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:26 +0000 (19:22 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:26 +0000 (19:22 -0800)
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6

1  2 
admin/gitmerge.el patch | diff1 | diff2 | blob | history
lisp/org/org-clock.el patch | diff1 | diff2 | blob | history

diff --cc admin/gitmerge.el
Simple merge
diff --cc lisp/org/org-clock.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.